projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fd515c 61a6640)
bitkeeper revision 1.185 (3ea53c98-FRIP-gsOidzpNrAOWwMNg)
authorach61@labyrinth.cl.cam.ac.uk <ach61@labyrinth.cl.cam.ac.uk>
Tue, 22 Apr 2003 12:59:04 +0000 (12:59 +0000)
committerach61@labyrinth.cl.cam.ac.uk <ach61@labyrinth.cl.cam.ac.uk>
Tue, 22 Apr 2003 12:59:04 +0000 (12:59 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/boulderdash/ach61/xeno/xeno.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
xen/drivers/block/xen_block.c patch | diff1 | diff2 | blob | history
xen/include/xeno/sched.h patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc xen/drivers/block/xen_block.c
Simple merge
diff --cc xen/include/xeno/sched.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.